merge
authorIan Campbell <ian.campbell@xensource.com>
Thu, 30 Nov 2006 16:36:18 +0000 (16:36 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Thu, 30 Nov 2006 16:36:18 +0000 (16:36 +0000)

Trivial merge